Trivial cleanup, checking in to switch machines.