Having variables exported from a DLL is slightly painful and potentially error-prone on Windows, so let's try get rid of them now when we can. Starting with these.