and use one-element tuplesfor string formatting

Signed-off-by: Lisa Velden <velden@google.com>
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>