Fix fn-then-comment refactor bug