Tidying.
Made things faster, I think.

@nhoffman -- sorry to give you another to test, but I realized this
should make things faster.