Fix breakage on JVM in the most awful way

By conditionally reverting to the map {} wrapper approach of before.  YUCK!