Here's a few small cleanup patches fixing things I've noticed in passing. I have them queued up to merge for 2.6.32; please let me know if you have any concerns about them.