fixup! Add a BlockTypeKey class to capture block types and block families.