Minor table parser change

Needs more investigation, tho...