Unified builtins2

to help improve performance?