Fix $toggle

With the recent changes, $toggle broke as propTarget was resolving to the owner, rather than the instance. This fixes it, and still maintains all of the fixes for dropdown etc.