Refactoring to allow per-parse instance: t+