A TODO that cannot be implemented is removed. A comment is added instead; other minor changes.