Removed previous invalid conditionals and replaced with guard flags.
Removed previous invalid conditionals and replaced with guard flags.

Also updated some comments based on review / feedback.
ptorsten/pfsense,phil-davis/pfsense,NewEraCracker/pfsense,NOYB/pfsense,NewEraCracker/pfsense,pfsense/pfsense,dennypage/pfsense,NewEraCracker/pfsense,ptorsten/pfsense,dennypage/pfsense,pfsense/pfsense,phil-davis/pfsense,dennypage/pfsense,ptorsten/pfsense,phil-davis/pfsense,dennypage/pfsense,pfsense/pfsense,NOYB/pfsense,NOYB/pfsense,phil-davis/pfsense,pfsense/pfsense,NewEraCracker/pfsense