Simplified some generated expressions