Remove some const_cast's
Merge pull request #152 from wmtan/removeMoreConstCasts

Remove some const_cast's