Merge pull request #1192 from sgraham/tidy-snprintf

Tidy up rate snprintf'ing helper