Pull in a minor cstructs fix.