ECPG: Some cosmetic fixes.