Fix brain fart in lexer for matching start codes in the accumulator
handler.  Fix token matching patterns to deal with wrapped tokens.