Updates to match recent code re-org.