Some more updates based on Gaby and Bjarne's feedback.