Thanks for this, KrisD15 - as I look over your suggestions (which look fine) I see a mystery in lines 4a and 4b that I'll discuss further in my response to DoninGA.
