Minor 'aesthetic' code changes for pull request.