Sorry, Joe. I made it as simple as I could, while comparing both old and new funding arrangements. I've emailed the company IR and Jason Napadano to take a look at my post and to clarify anything I might have missed.
I'll update my post if their responses indicate I've overlooked something in how I analyzed the new arrangement.