Cleaning up the cibuild stuff.