Address ericzundel's feedback in pr