Remove PairIterator interface, use struct type

Tests pass

Fixes #35