Happy to rebase if we merge #388 first.