Small tweak to context object handling in eachField, someField.