litmus/herd: lex some additional types, suppress << as a end marker in splitter