WP-2852: adjust spacing and type.