Motivated by #45

Ref #55

This momentarily breaks the iterator fault injection test, but I would
have had to squash too many commits to make it work right, so it
appeared to be the better option to disable the respective test for some
commits.