[PATCH v6 4/4] Use advice from review comment