Improved some on parsing header tokens and character constants.