mpi: Improve support for non-Weierstrass support.