I took a quick look, but my understanding of the current parser is not very deep. AFAIU, the issue is that the "from-element" referenced by MapKeyKnode represents Address rather than AddressType. I think this is derived directly from the reference to "r". While this makes sense for VALUE, the "from-element" here would have to represent AddressType, no idea really though how to achieve that.