Cleanup built-ins, and fix some compiler warnings/errors.