Constify and clean up even more.