Merge pull request #162 from mbebenita/master

Clean up script resolution.
Fix call super test case.
Fixes for each when keys are falsy.