More AssemblyBuilder tidyups