Some constness changes.