Fix tiny control-flow bug in 'if' statement def
Work on scoping functions, ignore piranha-like EOF bug for a while.