Changes to ensure diagnostics bit compare on different PE decompositions w/o littering the code with expensive lbc_lnk calls.