Merge branch 'fix-unifier' of github.com:mattwala/pymbolic