I like these shortcuts - perhaps add `None` and `RenamesAndCopiesHarder`? Since we have them, I'd suggest using them to make the tests more succinct as well.