Refactor
Method invocation in progress.
Dynamic scoping seems to work, but that is confusing.
Will implement lexical scope next.