Add option to disable space expandation.