Replace two calls to object::symbol_iterator::increment(), which had
been removed in r200442.