Renamed 'method-call' to 'method'.
Cleanup.
Renamed func-call to func.

This addresses issue #24 along with commit
cc878316c1f0bfc29ab599080339f4ae62fa1522.