Fix 'head' binding being shadowed and made buffer header clearer