> Ah, good point. How much are these used? I'm happy to make the same changes here but if we're moving away from them anyway then we can probably skip this to limit the files affected by this change.

Not a lot, only in some tests for which it is not worth creating an app object like FTU tests and those not yet migrated to app objects.