Simplify logic: no functional changes
Simplify logic: no functional changes

dennypage/pfsense,NewEraCracker/pfsense,NewEraCracker/pfsense,pfsense/pfsense,NewEraCracker/pfsense,pfsense/pfsense,pfsense/pfsense,dennypage/pfsense,NewEraCracker/pfsense,pfsense/pfsense,dennypage/pfsense,dennypage/pfsense