Minor javadoc cleanup.
Suppress warning.
Suppress warnings.
Clean up javadoc.
Fix code formatting.
Suppress warnings.
Minor refactoring for java 8 in generators.