@toirl This fork and our local copy are out of sync, and there are merge conflicts in ``brabbel/expression.py``. Can you take a look?