No more unary operator bugs