A little more work on the UMAC refactoring.