Convert more code to use new Minerva.