Unified builtins2

Great, thanks!