#2450 made the changes suggested by mkommend in the review. This is definitely a big improvement, thx!