Use uniform field in five more places, as adviced by Giuseppe.