Merge "Do not create Map subclasses"