Code style & javadoc improvements.
Only need to distinguish between values and no values.
Javadoc improvements.