Spacing / whitespace synch

Re-imported from remote workstation. Github client wants to say these
are differences, but I think it's EOF markers. committing to make GitHub
happy.