Clean up special handling of UPDATE planning