I think this is actually a huge, silent, killer issue. So I don't really see any point in keeping actorFor if we're going to completely break its semantics in respect to the other code. Also, Terminated.unapply should "do the right thing". And what does it mean to do: context watch context.actorFor(...) ?