Clean up more booleans.