Eliminate HandleSet entirely

Well, the aim was to reduce the use of HandleEntry but I'll take what I can get ... :-)