Update remaining tasks to use the new automaton syntax, other misc changes.
Fix previous commit.