1.3.11: Better escape handler.