Variables into objects — less with() calls.

And yes, even more whitespace.