Cleaned up removal of typed constraints from generated extension classes