React to options changes

You have this on the same branch you did primary constructors removal? Do you need to rebase?