Applied a class hierarchy separation patch by Chris P.
Now the iterator is an actual iterator and nothing but.
All the non-iterator code was moved to an intermediary
base class for the two P_S tables introduced by this WL.