Smith, McElroy reinforce 30-year-old battle lines