More tiny protocol changes, for simplicity and parsimony