Disable more stuff, and use cached booleans instead.