Also, reformat code using guidlines from the Friends of Whitespace.

Fix newTimeStamp() so that it always returns a timestamp.
XXX still not sure that it works.