Small refactoring in 'cdi-collections'