WP-2684: add space and spans.