More boolean conversions. No logic changes.