Unified builtins2

Yes, exactly.