More normalizing space.  Minimizing diff from branch.