Maintain context when resolving collisions

Fixes a bug where the function being returned to resolve function collisions wasn't being bound to the "parent" being mixed into. This allowed the mixed in functions to execute in unpredictable contexts.