Finished the Scanner for real this time.
Originally, I had forgotten string values, and symbols like , and ; may not have parsed correctly if prefixed/suffixed with other symbols.