Small C5 cleanup and some extra edits

These were the C5 changes I'd discussed a while back that were probably shrouded by GitHub's recognition of line conversion as changes. :P Now you should be able to find all of the lines easily! If you don't want these changes, just feel free to close the pull and I won't edit C5 again unless prior permission is granted (I'd emailed you asking about them, but I figured you'd like to see the code).

(Remove the branch master merge commit btw :P)