Cleanup for unary vs binary disambiguation