remove superfluous envelope types in favor of anonymous structs