SRTP: minor improvements to some structure constructors, part 2