My inclination is that (2) is slightly annoying, but maybe will be fine. Some chance it’ll get fixed, or, as Zach says, we can split it.