More boolean cleanup.