WP-3559: change spacing logic.