VID-1661 Use spaces for trailing comments