Add new assemblies
[sgen] Remove some dead #defines.