Expand to cover Maps returned from other Java API methods as well