Bug 1081598: Eliminate silly ternary expressions. r=rnewman

Reviewed on Bugzilla...