expressions: only quote when necessary (fixes tests; followup 915f5c1a)
indentation update