Merge pull request #436 from ebfe/fix-build-master

Partially fix build with rust master
comm: fix build

It's no longer possible to have a Box<Buffer> due to the new object
safety rules. Wrap in an enum as a workaround.

Closes #437