Generic type parameters shouldn't be escaped - fixes #585