Another pass of minor changes in preparation for new protocol.