For for JDK 1.8.
Fix a code-generation issue; re-enable most tests against FoodMart.