Bug 1081593: Clean up some ternary operators. r=rnewman

Reviewed on Bugzilla.