Some builtins are unnecessarily special (fix #521)