Cleaning up the OptionApplicator