Fix for ", " issue in jsing's knf script
remove duplicated tests in if statements
ok krw@ sthen@ deraadt@