Actually check if we resolved a PCR reference before assuming 8 bits You actually need to check if an expression collapsed to an integer before assuming it is one. Otherwise, you end up assuming everything is 8 bit offsets. Oops.