Further fiddling with const.