Compiler indicated cleanup - Reported by Peter Schorn