Change function of lift

Now returns MonoidAggregator[A, Option[B], Option[C]].
Also update and simplify some tests, and style fixes.