Removing gtyp and glab from the global namespace and function args