Port: more Automaton classes