Fix mixup of old and new-style string formatting