Yeah, this seems right. I will update the PR accordingly.