Minor structural changes.