These changes are unrelated. I'd prefer them in a separate pull, but happy to let them slide here.