The TODO 'Tidy up global variables' can go, replaced with a second