am 0e84041b: Refactor all phantom-space-inserted spaces in one place

* commit '0e84041bf740590230198fa845d8c45acd4cb586':
  Refactor all phantom-space-inserted spaces in one place