Fix some doxygen comments and add shortcut for tok==NULL to Token::simpleMatch()