Remove extraneous references to current field context variable

This should have been done as part of
6fc4e5db7c789a216f540131678cd68c693aa409