Fixes under-encoding of nonce formatting parameter.

This is what I get for generating a format string with a format string.
Merge branch 'nicer-test-message' into test