Okay, I'll take a quick look at it.  With this block, things also break.  We might just need n extra if check to see if it's a local reference or an external one.