Merged in log-tail stuff.