Handle end-trim correctly in player; there is scope to make this more efficient by...