Refactoring code for lifting: bookeeping clauses per variable
Comment additional clauses