Cosmetic fixes
Switch back to Thompson construction

AFAIK, my naive Glushkov implementation can't handle non-greedy
repetitions.  So I'll stick with Thompson for now.