Added support for this.method() invocations. Cleaned up invocation mapping a bit.