Cleaned up handling of change recording