I think the thing to do is to move it into restore_options(). Doing that now.