WP-3391: adjust styling to be more general.