Merge pull request #368 from reaperhulk/more-warnings-fixes

Remove some consts in the function arg declarations