Now support proper function calls within functions (fixed test19)