Refactored to remove extraneous calls.  We're much faster now (thanks Bruce Sutherland for the tips!).