Replace the old staff notation with staff2.  Update cljm.music.clementine to match.