Build fix.
Rearrange stuff in preparation for making things like Font reloadable.