Respecting spacing in draft mode, avoiding spurious spaces in final