Updated to correctly support "overloaded" function calls.