Change implementation of some combinators
Yet another hack to fix the update macro.