FIX: issue #402 (Single refinement can't precede refinement with arguments)
FIX: removed unused local variables.
FIX: removed leftover debugging code.
FIX: issue #403 ("Return:" in func spec corrupts local variables)
Merge branch 'master' into lex-scope