MEAP-14 changes in FPInScala