Removed duplicate definitions of g-type-name, g-type-from-name