How can I improve my functions organization (inspired to ask this question from reading http://justintadlock.com/archives/2010/12/30/wordpress-theme-function-files)?

1. pseudo-functions-BEFORE.php

<?php
	
	if ( ! function_exists('foo_setup')) {
		
		function foo_setup() {
			
			add_theme_support(...);
			add_theme_support(...);
			
		}
		
	}
	
	add_action('after_setup_theme', 'foo_setup');
	
	remove_action(...);
	remove_action(...);
	remove_action(...);
	
	function foo1_xxxx() { ... }
	add_action(..., 'foo1_xxxx');
	
	function foo2_xxxx() { ... }
	add_action(..., 'foo2_xxxx');
	
	function foo3_xxxx() { ... }
	add_action(..., 'foo3_xxxx');
	
	function foo4_xxxx() { ... }
	add_action(..., 'foo4_xxxx');
	
	function baz1_xxx() { ... }
	add_filter(..., 'baz1_xxx');
	
	function baz2_xxx() { ... }
	add_filter(..., 'baz2_xxx');
	
	function baz3_xxx() { ... }
	add_filter(..., 'baz3_xxx');
	
	function baz4_xxx() { ... }
	remove_all_filters(...);
	remove_all_filters(...);
	add_filter(..., 'baz4_xxx');
	
	function baz5_xxx() { ... }
	add_filter(..., 'baz5_xxx');
	
	add_image_size(...);
	add_image_size(...);
	add_image_size(...);
	add_image_size(...);
	add_image_size(...);
	add_image_size(...);
	
	function foo_shortcode() { ... }
	add_shortcode(..., 'foo_shortcode');

2. pseudo-functions-AFTER.php

<?php
	
	if ( ! function_exists('foo_setup')) {
		
		function foo_setup() {
			
			add_theme_support(...);
			
			add_theme_support(...);
			
			remove_action(...);
			remove_action(...);
			remove_action(...);
			
			add_action(..., 'foo1_xxxx');
			
			add_action(..., 'foo2_xxxx');
			
			add_action(..., 'foo3_xxxx');
			
			add_action(..., 'foo4_xxxx');
			
			add_filter(..., 'baz1_xxx');
			
			add_filter(..., 'baz2_xxx');
			
			add_filter(..., 'baz3_xxx');
			
			remove_all_filters(...);
			remove_all_filters(...);
			add_filter(..., 'baz4_xxx');
			
			add_filter(..., 'baz5_xxx');
			
			add_image_size(...);
			add_image_size(...);
			add_image_size(...);
			add_image_size(...);
			add_image_size(...);
			add_image_size(...);
			
			add_shortcode(..., 'foo_shortcode');
			
		}
		
	}
	
	add_action('after_setup_theme', 'foo_setup');
	
	function foo1_xxxx() { ... }
	
	function foo2_xxxx() { ... }
	
	function foo3_xxxx() { ... }
	
	function foo4_xxxx() { ... }
	
	function baz1_xxx() { ... }
	
	function baz2_xxx() { ... }
	
	function baz3_xxx() { ... }
	
	function baz4_xxx() { ... }
	
	function baz5_xxx() { ... }
	
	function foo_shortcode() { ... }

Discussion here.