Index: wp-includes/class-wp-query.php
===================================================================
--- wp-includes/class-wp-query.php	(revision 39408)
+++ wp-includes/class-wp-query.php	(working copy)
@@ -1711,7 +1711,13 @@
 		$page = 1;
 
 		if ( isset( $q['caller_get_posts'] ) ) {
-			_deprecated_argument( 'WP_Query', '3.1.0', __( '"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.' ) );
+			_deprecated_argument( 'WP_Query', '3.1.0',
+				sprintf(
+					__( '%1$s is deprecated. Use %2$s instead.' ),
+					'<code>caller_get_posts</code>',
+					'<code>ignore_sticky_posts</code>'
+				)
+			);
 			if ( !isset( $q['ignore_sticky_posts'] ) )
 				$q['ignore_sticky_posts'] = $q['caller_get_posts'];
 		}
Index: wp-includes/option.php
===================================================================
--- wp-includes/option.php	(revision 39408)
+++ wp-includes/option.php	(working copy)
@@ -1950,7 +1950,13 @@
 		unset( $new_whitelist_options[ $option_group ][ $pos ] );
 	}
 	if ( '' !== $deprecated ) {
-		_deprecated_argument( __FUNCTION__, '4.7.0', __( '$sanitize_callback is deprecated. The callback from register_setting() is used instead.' ) );
+		_deprecated_argument( __FUNCTION__, '4.7.0',
+			sprintf(
+				__( '%1$s is deprecated. Use %2$s instead.' ),
+				'<code>$sanitize_callback</code>',
+				'<code>register_setting()</code>'
+			)
+		);
 		remove_filter( "sanitize_option_{$option_name}", $deprecated );
 	}