Tightened up consts.