Cleanup handling of AssemblyInfo to be consistent