Move to CDI 1.1.