Minor structural updates.