Renamed `with` annotation property
also do not generate ? extends String in collection initializers