Is this comment still valid?  If so, can we implement that as part of this PR?