#5341: more built-in vs builtin fixes.
7 files changed