Merge "cutils: only support safe list iteration."