also simplified the implementation by using the index iterator as the base instead of the element iterator [SVN r21765]