Debug Info: Simplify the code changed in r182403 to reduce indent & avoid a duplicate lookup in the insertion case