A bunch of cleanup to the protocol

These are cleanup issues I've wanted to do before the protocol stabilizes. Removes some cruft that remains from earlier.