dbremner const correctness fixes from compiling as C++

Latest commit a6a0fe2

May 7, 2018