Rivian is simplifying its lineup, but expect a higher starting price.