m8: unify all variants