Shorten "Char_whatever" constants to "Ch_whatever", reformat some parsing statements