Removed old single-tokenizing exception variants