Included is the latest version of the code. Indenting it properly
actually reduced the size of the files by another 10K or so.