Changed 'tempo_mark' to 'tempo' everywhere in mainline.