Well, I got a little bit done on MOTR. I added some tests, and deleted the code that the test was exercising. I admit the test coverage for both versions of the code paths involved is... not great.
Tomorrow, I'll try to shore up those tests a little, then get on with the next major test coverage hole: running the Build action against synthetic data.
We'll see how that goes, but for now, I really really need to get to bed.