Improve tell-based protocol assumptions