More booleans cleanup.