1.0.14.2: XREF needs to account for the last node of a block as well