Auto-escape all arguments, removes code that was escaping all include/exclude arguments, fix tests