Some small clean-ups.

It appears so -- sorry for the confusion.