Which opera originally consisted of more acts, Acis and Galatea or Madama Butterfly?