CH-393: Clean up overuse/abuse of ternary operators.