shift_gauge_field: clean up a little