Comments added.
Removing local dependency on commons-collections.