Refactor ebib-next-field.