Clean things up so the services layer can easily emit without having to contort compiler hosts.