Push the trim_whitespace stuff upstream.