Will be completely wiped, I think, in favor of a Scanner (to tokens), then Parser mechanism.
No commit message
