Whitespace, carbon fixes

Carbon-Specific entities don't load traits and controllers unless carbon
is loaded