Fix bug in my conversion of Tom's snprintf to string_vformat. Also make