more cleanup from hexchat master
pull from hexchat master