Whoops, missed a few regexes for conversion/reindentation.
Miscellaneous cleanup. Marked a whole bunch of strings as raw because they are. Lots of minor futzing to quiet PyLint.
Found some three-space indentation mixed with the four-space indentation, and cleared all that up.