Review and changes from Jocelyn Fiat

This is not great, this could be at least a once, but also a specific nonce manager object.