Follow-up to r64937: expand ternary to conditionals because I hate nested ternaries.