feature #1664: Some minor cosmetic changes