Make the constraints demos to match more closely.