Bunch of one-liner fixes.

Minor one-liner fixes I did in the short time I had tonight.