Tidying

Key change: switching "selfattach" to "onetime" in protocol files where
it was previously incorrect