Fix statements recursively
Convert && to if