Fixes #2489, fixes #1819, fixes #1821 -- remove the __bind helper.