Removing the need to embed the Service environment into types during Stage2