Great work as always! (btw what's keeping the PR from being merged?)
Also, good thing to move this into a new thread!