After investigation, it seems we can eliminate the need to build proxy objects entirely when dealing with <dynamic-component/> mappings. Instead, we can deduce that we are operating on a Map directly and instead have the mappers be capable of supporting insertion into either use case. This means we can eliminate the MapProxyTool and associated tests as well as remove the direct dependency from Envers onto Javassist.