Pull in changes from cstructs.