Rewrote 'call' parser to properly and cleanly handle function calls