Fixed the deprecated call to MapMaker().makeComputingMap

Fixed the deprecated call to MapMaker().makeComputingMap - that method is now private and inaccessible.  Updated guava while I was at it.

This was breaking IntelliJ's debugger on code downstream.