Move function calling to extra method
Implement CALLMT
Implement CALLM
Add some tests for CALLM and CALLMT