Great, glad to see the ```_option_factory``` gone.