This added the function offset *again*, but it's already included in the line for the current file. And yes, I have explicitly tested a function file with a function defined at a later line. Fixes #6350
