cpp: More const fixes
cpp: More const fixes
cpp: Fixups