Some cleanup for type parameter utilities