Complete the fix for issue 103 by using UPCR_TLD_ADDR() on LHS of initializers of TLD variables