Minor (mostly aesthetic) changes.