Indeed, we should update that too. Would you mind posting to the mailing list with a cleanup proposal? If we break compatibility we as well can do it all at once.