Lots of changes, especially to the ExtendedTokenMFReader. Also, fixed reading prefixed number arguments to macro characters and added toStrings for several types. Fixed some of the complex types that had .equals() problems.