Merge branch 'ssnprintf-cleanup'