Simplify adding trivial builtins