Tidied up a few things.  No functional changes.