clean up tri-conditional syntax a bit
clean up tri-conditional syntax a bit

Change-Id: I899494c344f32c5161410d254d4e84fd7f6b7cc5
Reviewed-on: https://gerrit.instructure.com/21093
Reviewed-by: Duane Johnson <0a02221ea64f4c9685145b5f44cf84715b4a8bb5@instructure.com>
QA-Review: Duane Johnson <0a02221ea64f4c9685145b5f44cf84715b4a8bb5@instructure.com>
Product-Review: Duane Johnson <0a02221ea64f4c9685145b5f44cf84715b4a8bb5@instructure.com>
Tested-by: Jenkins <d95b56ce41a2e1ac4cecdd398defd7414407cc08@instructure.com>

venturehive/canvas-lms,skmezanul/canvas-lms,fronteerio/canvas-lms,leftplusrightllc/canvas-lms,antoniuslin/canvas-lms,roxolan/canvas-lms,juoni/canvas-lms,narigone/canvas,usmschuck/canvas,Unow/ins,arrivu/qibla-ecampus,leftplusrightllc/canvas-lms,ShreniiNepal/shrenii_lmp,fronteerio/canvas-lms,whalejasmine/canvas-lms,Jyaasa/canvas-lms,jay3126/canvas-lms,matematikk-mooc/canvas-lms,wrdsb/canvas-lms,tgroshon/canvas-lms,SwinburneOnline/canvas-lms,grahamb/canvas-lms,arrivu/jigsaw-lms,HotChalk/canvas-lms,va7map/canvas-lms,roxolan/canvas-lms,merichar/canvas-lms,leftplusrightllc/canvas-lms,samuels410/greatlakes-lms,greyhwndz/canvas-lms,sfu/canvas-lms,Jyaasa/canvas-lms,roxolan/canvas-lms,venturehive/canvas-lms,antoniuslin/canvas-lms,snehakachroo1/LSI_replica,sfu/canvas-lms,utkarshx/canvas-lms,gbleydon/canvas-lms,usmschuck/canvas,dgynn/canvas-lms,sdeleon28/canvas-lms,matematikk-mooc/canvas-lms,instructure/canvas-lms,gbleydon/canvas-lms,wye0220/shindig-canvas,Rvor/canvas-lms,Rvor/canvas-lms,grahamb/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,Unow/canvas-lms,instructure/canvas-lms,leftplusrightllc/canvas-lms,juoni/canvas-lms,shidao-fm/canvas-lms,matematikk-mooc/canvas-lms,redconfetti/canvas-lms,arrivu/hoodemo,loganrun/pincan,usmschuck/canvas,utkarshx/canvas-lms,wye0220/shindig-canvas,kyroskoh/canvas-lms,va7map/canvas-lms,djbender/canvas-lms,redconfetti/canvas-lms,jay3126/canvas-lms,wrdsb/canvas-lms,skmezanul/canvas-lms,greyhwndz/canvas-lms,snehakachroo1/LSI_replica,dgynn/canvas-lms,redconfetti/canvas-lms,djbender/canvas-lms,Unow/ins,grahamb/canvas-lms,redconfetti/canvas-lms,Unow/canvas-lms,whalejasmine/canvas-lms,ShreniiNepal/shrenii_lmp,roxolan/canvas-lms,wimemx/Canvas,va7map/canvas-lms,greyhwndz/canvas-lms,arrivu/qibla-ecampus,greyhwndz/canvas-lms,narigone/canvas,fronteerio/canvas-lms,jay3126/canvas-lms,kyroskoh/canvas-lms,whalejasmine/canvas-lms,wye0220/shindig-canvas,Unow/canvas-lms,fronteerio/canvas-lms,Jyaasa/canvas-lms,sdeleon28/canvas-lms,arrivu/jigsaw-lms,tgroshon/canvas-lms,arrivu/hoodemo,gbleydon/canvas-lms,matematikk-mooc/canvas-lms,arrivu/arrivu-lms,venturehive/canvas-lms,juoni/canvas-lms,antoniuslin/canvas-lms,landonwilkins/canvas-lms,usmschuck/canvas,utkarshx/canvas-lms,merichar/canvas-lms,utkarshx/canvas-lms,narigone/canvas,sfu/canvas-lms,grahamb/canvas-lms,HotChalk/canvas-lms,HotChalk/canvas-lms,arrivu/hoodemo,tgroshon/canvas-lms,snehakachroo1/LSI_replica,djbender/canvas-lms,efrj/canvas-lms,wimemx/Canvas,sfu/canvas-lms,kyroskoh/canvas-lms,AndranikMarkosyan/lms,merichar/canvas-lms,ShreniiNepal/shrenii_lmp,AndranikMarkosyan/lms,ShreniiNepal/shrenii_lmp,skmezanul/canvas-lms,skmezanul/canvas-lms,va7map/canvas-lms,antoniuslin/canvas-lms,shidao-fm/canvas-lms,arrivu/arrivu-lms,tgroshon/canvas-lms,wrdsb/canvas-lms,wrdsb/canvas-lms,whalejasmine/canvas-lms,SwinburneOnline/canvas-lms,sfu/canvas-lms,SwinburneOnline/canvas-lms,dgynn/canvas-lms,Unow/ins,loganrun/pincan,shidao-fm/canvas-lms,landonwilkins/canvas-lms,sdeleon28/canvas-lms,Rvor/canvas-lms,instructure/canvas-lms,eCNAP/CANVAS,SwinburneOnline/canvas-lms,juoni/canvas-lms,arrivu/arrivu-lms,landonwilkins/canvas-lms,instructure/canvas-lms,instructure/canvas-lms,Rvor/canvas-lms,snehakachroo1/LSI_replica,HotChalk/canvas-lms,efrj/canvas-lms,venturehive/canvas-lms,eCNAP/CANVAS,efrj/canvas-lms,samuels410/greatlakes-lms,grahamb/canvas-lms,wimemx/Canvas,AndranikMarkosyan/lms,AndranikMarkosyan/lms,arrivu/jigsaw-lms,loganrun/pincan,efrj/canvas-lms,dgynn/canvas-lms,samuels410/greatlakes-lms,Jyaasa/canvas-lms,landonwilkins/canvas-lms,sdeleon28/canvas-lms,instructure/canvas-lms,shidao-fm/canvas-lms,eCNAP/CANVAS,kyroskoh/canvas-lms,narigone/canvas,samuels410/greatlakes-lms,eCNAP/CANVAS,jay3126/canvas-lms,sfu/canvas-lms,instructure/canvas-lms,arrivu/qibla-ecampus