Unified builtins2

This is just defensive coding.