CNA2ph: more compact state matchings
Merge branch 'master' of github.com:pauleve/pint
ph2thomas: fix auto fixed points