[PATCH] Clean up char/esp.c