Trail pointer logic cleanup