This pull request just exists to have a place to put comments.  Please don't pull!

Style thing - For readability, I like constructing these unbalanced if/else statements so that the small branch comes first.