More relics of the base->raw migration.