[#2547] Proofreading nice changes by @WouterJ to the OptionsResolver component