Fix problems in tests and code relating to built-ins.