Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 19742)
+++ wp-includes/post.php	(working copy)
@@ -1027,7 +1027,7 @@
 				$wp_rewrite->add_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );
 		}
 
-		$wp_rewrite->add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->rewrite['ep_mask'] );
+		$wp_rewrite->add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite );
 	}
 
 	if ( $args->register_meta_box_cb )
Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php	(revision 19742)
+++ wp-includes/taxonomy.php	(working copy)
@@ -344,7 +344,7 @@
 			$tag = '([^/]+)';
 
 		$wp_rewrite->add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
-		$wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front'], $args['rewrite']['ep_mask'] );
+		$wp_rewrite->add_permastruct( $taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite'] );
 	}
 
 	if ( is_null($args['show_ui']) )