Some renaming

Instead of sometimes using 'merge-point', always use 'mp'.
Use 'mp-tail-trace', only to refer to the mp-tail-trace struct
Some smaller refactoring in stopping and merging traces