Cleanup names-of-struct
Make structs initialize to constant instead of covariant.