Begin fixing function scope problems, function expression assignments still get the wrong linenr inside another function