Small code simplification.
Improve CDI extension.