LGTM!

But also wait for marusich's input.