Further const placement changes.