Cleans up basic communication of sheep & shepherd.

* Few changes, just a little cleaning.
* Mostly untested.