Remove even more const code.