MUC: A little cleanup.