Conditional syntax cleanup
Escape character cleanup
Fix pseudo-progress check