Small code re-org.