Re: [PATCH 0/7] legacy helper cleanup