Handled edge cases with function calls not by name. Fixes #97