Merge patch series "ISA string parser cleanups"