More careful with parsing TM output (so that we do not get spurious entries in the common data hashes)