(Test suite: Fixes in the tests (not in FreeMarker) so that it's successful on Java 8.)