Tidy things up some more.