@andrejbauer, if you _do_ feel strongly about removing the commented part, please say so and I'll get rid of it.  Otherwise, I'm still hoping someone will merge this.