fixup! WIP: add GS visitors