x86: cleanup mpspec variants