And (with apologies for the spam) a further, hopefully final update, that works in narrowed buffers.