Remove remaining currTarget references

It was renamed to _currentTarget a while ago, but all these surfaces are incorrect.

This stuff should actually be fairly easily testable, have you guys considered Zuul?