minor parser cleanup, externalizing parsing table