Issue #1981316 by aspilicious, andypost, pcambra, swentel: Drop procedural usage of fields in [f-l] modules.