Minor changes based on feedback from BSI and WG21.