Tweak spec strings for mmach= support.