(This is required in order to generate hol_light_binaries). Also do a bit of cleanup. svn path=/nixpkgs/trunk/; revision=23684