Fixed some methods returning Token when they should be returning char.