Migrate to choco-3.3.0