A few other minor code changes for formatting.  I missed these in the last commit.