Cleanup; fix retain cycle for target passed in addTarget: