C fix for issue #81.

iterator_test has a new failure, looks like bug in interators.c.