Subsystem restructuring. Please avoid merging stuff which would conflict with this. This took days to update.

some recent merges were lost due to entire conflicting files. I did ask nicely.
other people violate the standards constantly with stupidity.
I've stated why it's used here, and it's entirely valid.

The variable name is fine, it's a light datum with a changed var...it's pretty obvious.