[TAP] Make the last commit compatible with Java 7.

In Java 8, implementing the function remove() of the interface Iterator<E> is
no longer required if not implemented. But not in Java 7.