Fixed up some errors in FSA_Literal, re-added Jon's Token class.