Less handle entry

Remove HandleEntry completely.  At last!