Fixed function-calls test and moved function call lookup in statement list for jj file