[mfc] cosmetic fixes