Thanks for the pointer to the issue, sure looks like you got things covered!
Perhaps refer to the issue in the todo?