Get rid of the `functionCall` notation; use actual Solidity syntax instead

[dfilaretti]

This has already been done for the case of internal function call.
However, it still needs doing for external calls.