Some more cleanup, mostly to flippers.