Fix the new encoder's field handling
The new field/machine-based encoder does not handle virtual fields and does not correctly handle field numbers
The new field/machine-based encoder does not handle virtual fields and does not correctly handle field numbers