Tiny code re-org.