Changed safety to include session types.