Unified builtins2

One last merge...