@atagar pointed rightly out that I was lazy in 5360a213 as not all list() changes need to be made. We should clean that up by having a closer look at when it is actually needed and when not.
list()