Use dict-based format strings for numbers (bug 1165)