Minor fix to my overzealous use of ternaries... with more ternaries