Cleanup builtin.c