Whininess reduction project

These should be const.