Thanks, polishing looks good (although we need to agree on the `ARPMH` wrapper test).