changes provoked by preparation of talk for CPPCon