Fixed original USPC class parsing

There is no particular visible pattern in how these are reported at
issue in XML files but this one seems to work fine to make it same with
PATFT DB.