Move on to CDI 1.1 anyway (matches Java EE 7 / JSF 2.2 better).