ListBuilder & refactorings.