Got args cleaned up to accept function calls and function declarations. Also cleaned up lookahead for funcall