Thanks, this can be simplified. (There used to be a reason for it, but no longer.)