Some parsing friendly spacing corrections (nw)