Merge second and third pass of note processing; there is no reason to have them separated