LGTM; I think I'll add a comment here explaining why this is needed; will do during merge.