Pull in minor change from cstructs.