Added further traits to decompose matcher types.
Added some further matchers to the completer automata.
Minor formatting fix and removing an obsolete TODO.