Cleanup.
Remove unused function.
Remove unget_cpp_token.

unget_token just forwards calls to unget_cpp_token. This patch removes
that useless indirection and merges them.