@will, looks like @rickkas7 has solved the issue:
As stated in the above ticket, I will fold the solution into my code to see if we can get a happy result there too.
Back soon!