#662174: handlers with an "extra form" or other option data that was not in the main form could lose that data.