The diff from -16 to -17 resolved the issues I raised earlier so 
this one seems ready to me.