Fix after review.
Add some consts.