Tightened up the handling of field labels