Fix comments.

(And oops forgot the commit one test case.)
Revert 41e0978, and update the corresponding test case.