Minor update from cstructs repo.