One more set of or cleanups.