Clean/split up immutant.util.