Conditional cleanup

(Waiting for other stuff to be merged since I'm trying to keep merge conflicts less annoying for people)

Ideally we get to the point of no, or almost no, preprocessor conditionals like this. One major advantage is ensuring all configurations build, by only having one configuration. Similarly, this will allow us to have runtime selection of versions, but that'll take a little more effort due to T6XX/T8XX hacks.