By merging tracker!254 without !202 I inadvertently broke the test suite. This pulls in the relevant fixes.