cli: Applied Brian's fix for rx data corruption and cleaned up X_task()'s