Add a missing substitution case.
Add some missing quotes for the pretty printer.