I took a look at this patch and changed a couple things:
* I made a similar adjustment to a few lines that seem to have been missed. * I removed a couple of asterisks from the adjusted lines in order to maintain the existing line lengths.
Barring additional feedback, I think this is ready for commit.