Fix spurious spaces in variable expansions.