Interesting that you didn't switch to the Option callback format you added to some, but not all constructors.  In the end I think this is going away so no need to fix.