Fix more warnings from #579

This is called from commented code.