Issue #2080625 by areke, mrsinguyen: Remove unused local variables for the field module.