Upgrade to Cilantro 2.2.26

Fix #1.

There were also a couple changes that needed to be made because of changes in Cilantro.