Make sure that set_geometry is called only when the relevant options are changed