only remaining next_non_set_unsafe() loops should need cleanup now