More structure refinements.