const poisoning fixups.