Cleaned up EscapeSuggester.