Incorporate @orta's feedback.