LGTM -- you want to open a PR on my branch so you can get credit (and `git blame` :) ) for this change? I just pushed a fix that addressed the other comments, so you could just update to that and submit a quick PR.