Fix help presentation and overly-aggressive regexp escaping