Two Persistent Dimensions of Democracy: Contestation and Inclusiveness