Minor fallout from FP-1344: spacing and quotes.