Various minor cosmetic changes.