diff --git a/refpolicy/policy/support/loadable_module.spt b/refpolicy/policy/support/loadable_module.spt
index 63488ea..b30be16 100644
--- a/refpolicy/policy/support/loadable_module.spt
+++ b/refpolicy/policy/support/loadable_module.spt
@@ -9,7 +9,7 @@
 # For adding the module statement
 #
 define(`policy_module',`
-	ifdef(`self_contained_policy',`',`
+	ifndef(`self_contained_policy',`
 		module $1 $2;
 
 		require {
@@ -98,11 +98,9 @@ define(`optional_policy',`
 	',`
 		optional {`'pushdef(`__in_optional_policy')
 			$1
-		ifelse(`$2',`',`',`
-		} else {
+		ifelse(`$2',`',`',`} else {
 			$2
-		')
-		}`'popdef(`__in_optional_policy')`'ifndef(`__in_optional_policy',` # end optional')
+		')}`'popdef(`__in_optional_policy')`'ifndef(`__in_optional_policy',` # end optional')
 	')
 ')
 
@@ -152,11 +150,9 @@ define(`tunable_policy',`
 	ifdef(`self_contained_policy',`
 		if (`$1') {
 			$2
-		ifelse(`$3',`',`',`
-		} else {
+		ifelse(`$3',`',`',`} else {
 			$3
-		')
-		}
+		')}
 	',`
 		# structure for tunables
 		# will go here instead of a
@@ -165,13 +161,10 @@ define(`tunable_policy',`
 		gen_require(`
 			delcare_required_symbols(`$1')
 		')
-
 		if (`$1') {
 			$2
-		ifelse(`$3',`',`',`
-		} else {
+		ifelse(`$3',`',`',`} else {
 			$3
-		')
-		}
+		')}
 	')
 ')