Constify a few methods.
Merge branch 'cleanup/const' into integrate