Some minor cleanup stuff I came across while browsing the code.

Marco, here is just some minor cleanup stuff I found while browsing the code.  Feel free to take or ignore anything u like.  No functional change.