Merge branch 'jk/snprintf-cleanups'