I'd be happy to make the changes you suggest (this one and below). The question is, since Carlo repackaged my PR into a couple of his own changes, should the changes be made in my PR or his repackaged one?