I'm looking on a proper solution for this with the variety of way we parse all of the data. Not sure if this will get into 7.3.2, but we'll see.