Move labels/accesskeys back onto menuitem nodes