More work on struct variables.