While the current way makes it really easy to find where the variables are used, going via struct would make sense in every other sense. Probably should do it for the whole module though.