Cleaner option checking and/or defaults setting (thanks @justinmk)