protocol: Cleanup and more spec coverage.