Fix bug introduced in 22522caf65ae5d7a6ebc3de928689212ae236535.

Changed auxl, auxr (which were uninitialized) to aux.  No idea
how the code was working for any problems with aux arrays.

Also cleaned up some other small things.