Review updated in advance of -07 being posted having had email discussion and seen the github edits.