Fixed the way locations were being tracked in outgoing streams. Now entry/exit into a variant is marked by entry/exit into a block and thus, the locations of entities within variants get accurately assigned locations in the outgoing stream