Iterator fixes: skipping field indexes, and using unevaluated expressions