More NullRemovingEntryHandler additions