Some more cleanups, following up the previous mce cleanup series.This doesn't change any code behaviour, just tidies up the codea bit.This applies on top of the previous cleanup series.-Andi