Adding more strict const checking.
Adding more strict const checking.