Add a bunch of x- fields.