inflate-upstream: rewrite a bit for clarity