Converted the custom entity change delegate to just use a System.Action<T> with a single entry object containing both context and entity.