Some cleanup of type specs so they're more readable (and also more precise).