Better unary rules support