fix name scope error in remove_descriptor (plus some ws/linelen fixes)
fix name scope error in remove_descriptor (plus some ws/linelen fixes)

lindenlab/eventlet,lindenlab/eventlet,collinstocks/eventlet,lindenlab/eventlet,tempbottle/eventlet,collinstocks/eventlet,tempbottle/eventlet