nicer pattern: the context manager waits for map() completion
list is a factory
superfluous code
added a XXX
Merge commit 'a1925441ba24b5396b8298c95c60178adc57bdf0' into feature/db-refactor