Issue #1981334 by pcambra, aspilicious, swentel, andypost: Drop procedural usage of fields in [n-r] modules.