Get rid of a few ternaries.