Performance back to what I had before.  At least the code is maintable now.