Re: const cleanup round 1