Bastian Kleineidam: fix so it cleans up the temporary script-building

directory too.  Also generally cleaned up the code.