Minor bug fixes on comments and ranges.

Haven't I learned the val-val dependency problem by now?