Reworking some of the requires in the init and site manifests.