Refactor gtype-from-id, gtype-from-name