SRTP: minor improvements to some structure constructors