Fixing calljs falsy

Fixes an issue found in #1014 (builds upon it) and does it a bit more comprehensively;