use valid syntax for type parameters in expression trivia
handle some \todos