Tidying up packaging for 1.9, including the new arbiter