I'll commit this in a few days if there are no objections.