Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php	(revision 6110)
+++ wp-includes/post-template.php	(working copy)
@@ -286,7 +286,9 @@
 		'date_format' => get_option('date_format'),
 		'child_of' => 0, 'exclude' => '',
 		'title_li' => __('Pages'), 'echo' => 1,
-		'authors' => '', 'sort_column' => 'menu_order, post_title'
+		'authors' => '', 'sort_column' => 'menu_order, post_title',
+		'style' => 'list', 'title_before' => '<h2>', 'title_after' => '</h2>',
+		'before' => '<li class="pagenav">', 'after' => '</li>',
 	);
 
 	$r = wp_parse_args( $args, $defaults );
@@ -305,16 +307,14 @@
 	$pages = get_pages($r);
 
 	if ( !empty($pages) ) {
-		if ( $r['title_li'] )
-			$output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
+		$output .= $r['before'].$r['title_before'].$r['title_li'].$r['title_after'].'<ul>';
 
 		global $wp_query;
 		if ( is_page() )
 			$current_page = $wp_query->get_queried_object_id();
+			
 		$output .= walk_page_tree($pages, $r['depth'], $current_page, $r);
-
-		if ( $r['title_li'] )
-			$output .= '</ul></li>';
+		$output .= '</ul>'.$r['after'];
 	}
 
 	$output = apply_filters('wp_list_pages', $output);