Add new TODO entry.
Remove obsolete test.
Remove obsolete comment.
Update function grammars and add tests for them.