Fix duplicate sub-expressions