Thanx for the hint, Chris!
However, this is true for a much wider range of code than touched by this topic branch. We should tackle it separately.