I'm sorry for that previous patch which included some typos.  The fixed
patch is attached.  Thanks!