Merge pull request #1664 from Hi-Angel/constify-stuff3

More constification