Some more work on the new builtins.