Further work cleaning up protocol layer
Merge pull request #568 from rorygraves/swank_refactor2

Further work cleaning up protocol layer