Issue #1981342 by aspilicious, andypost, swentel: Drop procedural usage of fields in [s-u-v] modules.
