Seem to have fixed the deep recursion issue.  Although I'm a little worried I don't understand the fix.  :-/