Remove an overly clever attempt to allocate a temporary array once and only once.
And, tidy up some issues that make whitespace-mode cranky.