Issue 107, HTM.java needs to be buildable by JDK 1.8. This is first pass.