FEAT: minor code factorization.