Made things a bit more const correct.