Issue #1981336 by aspilicious, andypost, swentel, amateescu: Drop procedural usage of fields in [t*] modules.