Fix a corner case for comma based completion.
Cleanup TODO.