DRY up the safety checks and ensure they are run

With shifting around the options parsing and function calls in previous
commits, there were some cases where not all applicable saftey checks
were being run.