* support non-static calls of static closures

* add tests for all static/non-static combinations

(cherry picked from commit d8d65fdfe91f40d50c3c12645e2c4d4e7ee9a221)