* xp grammar unary cleanup