Minor changes, if any.  But all seems to work.