minor logic simplification 836 lines
Authored by: hansonr 2017-07-07
Parent: [r21654]
Child: [r21656]