This is fine with me. Are you ok with the style change, @caitp?

It should probably be a separate commit though.