GATEWAY-3314: Code review fixes.  Changed comparableII to wrap original II rather than extend.