WIP refactoring texpr