file state: refactor to avoid shadowing comment() func; optimization too
actually stop shadowing
Merge pull request #5081 from hulu/file-comment-shadowing

file state: refactor to avoid shadowing comment() func; optimization too