Revert "First attempt at handling nested function calls."

This reverts commit d0921669839512c07659f040bb3e5fa0a563ff25.
Try fixing function calls with more than 6 params.