Turn structure into a pointer first, before ACME changes
Authored by: dannybackx 2020-02-18
Parent: [r293]
Child: [r295]