I should have read further down the pull request, as git has made this translation slightly confusing to read - the mapping is slightly mis-aligned. I'll try and re-understand this then adjust my previous comments as appropriate.