Address most of Nick Kledzik's comments.

See
http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20131202/094955.html

Change-Id: I72f89dae8c092348b62896eff65343d050f1a391