buffer: simplify the normalization logic for right=collapse