This addresses a potential performance problem, fixed in the post-0.2.20 source. It's intended for application to a package definition updated to 0.2.20, which Ludo said is in the pipeline. Apologies that I don't seem to have converged on an acceptable style for changes.