These do need to be reimploded at some point probably, but this at least gets them out of common code.
