Minor update from cstructs.