Try to regain some performance

... by boiling the ocean.  This gave me  a big headache.
Basically, try to avoid excess handle copies.