s/EspressoError/espresso.Error/
Cleanup some rows over 80 chars wide