Re: [PATCH 3/4] minor touchups