While debugging this I got annoyed by some seemingly random slow performance and thus snuck in a quick fix for that.