Cleanup a few multi var assigning declarations.