diff --git a/library/apt b/library/apt
index 8aa8347433d..46c730f4e90 100644
--- a/library/apt
+++ b/library/apt
@@ -181,12 +181,12 @@ def main():
     module = AnsibleModule(
         argument_spec = dict(
             state = dict(default='installed', choices=['installed', 'latest', 'removed', 'absent', 'present']),
-            update_cache = dict(default='no', choices=BOOLEANS, aliases=['update-cache'], type='bool'),
-            purge = dict(default='no', choices=BOOLEANS, type='bool'),
+            update_cache = dict(default='no', aliases=['update-cache'], type='bool'),
+            purge = dict(default='no', type='bool'),
             package = dict(default=None, aliases=['pkg', 'name']),
             default_release = dict(default=None, aliases=['default-release']),
-            install_recommends = dict(default='yes', aliases=['install-recommends'], choices=BOOLEANS, type='bool'),
-            force = dict(default='no', choices=BOOLEANS, type='bool')
+            install_recommends = dict(default='yes', aliases=['install-recommends'], type='bool'),
+            force = dict(default='no', type='bool')
         ),
         supports_check_mode = True
     )
diff --git a/library/assemble b/library/assemble
index e4c98be4a61..5819352dd28 100644
--- a/library/assemble
+++ b/library/assemble
@@ -94,7 +94,7 @@ def main():
         argument_spec = dict(
             src = dict(required=True),
             dest = dict(required=True),
-            backup=dict(default=False, choices=BOOLEANS, type='bool'),
+            backup=dict(default=False, type='bool'),
         ),
         add_file_common_args=True
     )
diff --git a/library/copy b/library/copy
index 584e2eb9117..c57e95cbc26 100644
--- a/library/copy
+++ b/library/copy
@@ -78,8 +78,8 @@ def main():
         argument_spec = dict(
             src=dict(required=True),
             dest=dict(required=True),
-            backup=dict(default=False, choices=BOOLEANS, type='bool'),
-            force = dict(default='yes', choices=BOOLEANS, aliases=['thirsty'], type='bool'),
+            backup=dict(default=False, type='bool'),
+            force = dict(default='yes', aliases=['thirsty'], type='bool'),
         ),
         add_file_common_args=True,
     )
diff --git a/library/cron b/library/cron
index 7d54b8c9533..513f73dda7b 100644
--- a/library/cron
+++ b/library/cron
@@ -259,13 +259,13 @@ def main():
             job=dict(required=False),
             cron_file=dict(required=False),
             state=dict(default='present', choices=['present', 'absent']),
-            backup=dict(default=False, choices=BOOLEANS, type='bool'),
+            backup=dict(default=False, type='bool'),
             minute=dict(default='*'),
             hour=dict(default='*'),
             day=dict(default='*'),
             month=dict(default='*'),
             weekday=dict(default='*'),
-            reboot=dict(required=False, default=False, choices=BOOLEANS, type='bool')
+            reboot=dict(required=False, default=False, type='bool')
         )
     )
 
diff --git a/library/easy_install b/library/easy_install
index a6ff3fdc8f1..a0e3d0f5bab 100644
--- a/library/easy_install
+++ b/library/easy_install
@@ -82,7 +82,7 @@ def main():
     arg_spec = dict(
         name=dict(required=True),
         virtualenv=dict(default=None, required=False),
-        virtualenv_site_packages=dict(default='no', choices=BOOLEANS, type='bool'),
+        virtualenv_site_packages=dict(default='no', type='bool'),
         virtualenv_command=dict(default='virtualenv', required=False),
     )
 
diff --git a/library/file b/library/file
index 0710ba3fdba..07a73d10a72 100644
--- a/library/file
+++ b/library/file
@@ -140,7 +140,7 @@ def main():
         argument_spec = dict(
             state = dict(choices=['file','directory','link','absent'], default='file'),
             path  = dict(aliases=['dest', 'name'], required=True),
-            recurse  = dict(default='no', choices=BOOLEANS, type='bool')
+            recurse  = dict(default='no', type='bool')
         ),
         add_file_common_args=True,
         supports_check_mode=True
diff --git a/library/get_url b/library/get_url
index 89a1ceae217..f5417083389 100644
--- a/library/get_url
+++ b/library/get_url
@@ -195,7 +195,7 @@ def main():
         argument_spec = dict(
             url = dict(required=True),
             dest = dict(required=True),
-            force = dict(default='no', choices=BOOLEANS, aliases=['thirsty'], type='bool')
+            force = dict(default='no', aliases=['thirsty'], type='bool')
         ),
         add_file_common_args=True
     )
diff --git a/library/git b/library/git
index 2909bd62da3..3691f735903 100644
--- a/library/git
+++ b/library/git
@@ -223,7 +223,7 @@ def main():
             repo=dict(required=True, aliases=['name']),
             version=dict(default='HEAD'),
             remote=dict(default='origin'),
-            force=dict(default='yes', choices=BOOLEANS, type='bool')
+            force=dict(default='yes', type='bool')
         )
     )
 
diff --git a/library/hg b/library/hg
index 87a5b62e72d..fe325bd3355 100644
--- a/library/hg
+++ b/library/hg
@@ -204,8 +204,8 @@ def main():
             repo = dict(required=True),	    
             dest = dict(required=True),
             revision = dict(default="default"),
-            force = dict(default='yes', choices=BOOLEANS, type='bool'),
-            purge = dict(default='no', choices=BOOLEANS, type='bool')
+            force = dict(default='yes', type='bool'),
+            purge = dict(default='no', type='bool')
         ),
     )
     repo = module.params['repo']
diff --git a/library/ini_file b/library/ini_file
index 9b1067a843c..c31fb687126 100644
--- a/library/ini_file
+++ b/library/ini_file
@@ -158,7 +158,7 @@ def main():
             section = dict(required=True),
             option = dict(required=False),
             value = dict(required=False),
-            backup = dict(default='no', choices=BOOLEANS, type='bool'),
+            backup = dict(default='no', type='bool'),
             state = dict(default='present', choices=['present', 'absent'])
         ),
         add_file_common_args = True
diff --git a/library/lineinfile b/library/lineinfile
index ef879d7ae85..cab3df3627a 100644
--- a/library/lineinfile
+++ b/library/lineinfile
@@ -241,8 +241,8 @@ def main():
             line=dict(aliases=['value']),
             insertafter=dict(default=None),
             insertbefore=dict(default=None),
-            create=dict(default=False, choices=BOOLEANS, type='bool'),
-            backup=dict(default=False, choices=BOOLEANS, type='bool'),
+            create=dict(default=False, type='bool'),
+            backup=dict(default=False, type='bool'),
         ),
         mutually_exclusive = [['insertbefore', 'insertafter']],
         add_file_common_args = True,
diff --git a/library/pacman b/library/pacman
index 8a256a54c6a..b2168a35fdc 100755
--- a/library/pacman
+++ b/library/pacman
@@ -134,7 +134,7 @@ def main():
     module = AnsibleModule(
             argument_spec    = dict(
                 state        = dict(default="installed", choices=["installed","absent"]),
-                update_cache = dict(default="no", choices=BOOLEANS, aliases=["update-cache"], type='bool'),
+                update_cache = dict(default="no", aliases=["update-cache"], type='bool'),
                 name         = dict(aliases=["pkg"], required=True)))
                 
 
diff --git a/library/pip b/library/pip
index d5418255c30..224e3f99d0e 100644
--- a/library/pip
+++ b/library/pip
@@ -158,9 +158,9 @@ def main():
             version=dict(default=None, required=False),
             requirements=dict(default=None, required=False),
             virtualenv=dict(default=None, required=False),
-            virtualenv_site_packages=dict(default='no', choices=BOOLEANS, type='bool'),
+            virtualenv_site_packages=dict(default='no', type='bool'),
             virtualenv_command=dict(default='virtualenv', required=False),
-            use_mirrors=dict(default='yes', choices=BOOLEANS, type='bool'),
+            use_mirrors=dict(default='yes', type='bool'),
             extra_args=dict(default=None, required=False),
         ),
         required_one_of=[['name', 'requirements']],
diff --git a/library/rabbitmq_plugin b/library/rabbitmq_plugin
index 3b21607ee7f..9584bd40a63 100644
--- a/library/rabbitmq_plugin
+++ b/library/rabbitmq_plugin
@@ -75,7 +75,7 @@ class RabbitMqPlugins(object):
 def main():
     arg_spec = dict(
         names=dict(required=True, aliases=['name']),
-        new_only=dict(default='no', choices=BOOLEANS, type='bool'),
+        new_only=dict(default='no', type='bool'),
         state=dict(default='enabled', choices=['enabled', 'disabled'])
     )
     module = AnsibleModule(
diff --git a/library/rabbitmq_user b/library/rabbitmq_user
index a5f3ce67660..ada7f411c8a 100644
--- a/library/rabbitmq_user
+++ b/library/rabbitmq_user
@@ -178,7 +178,7 @@ def main():
         configure_priv=dict(default='^$'),
         write_priv=dict(default='^$'),
         read_priv=dict(default='^$'),
-        force=dict(default='no', choices=BOOLEANS, type='bool'),
+        force=dict(default='no', type='bool'),
         state=dict(default='present', choices=['present', 'absent'])
     )
     module = AnsibleModule(
diff --git a/library/rabbitmq_vhost b/library/rabbitmq_vhost
index 3ae0775bd8e..196b8f6b1e1 100644
--- a/library/rabbitmq_vhost
+++ b/library/rabbitmq_vhost
@@ -100,7 +100,7 @@ class RabbitMqVhost(object):
 def main():
     arg_spec = dict(
         name=dict(required=True, aliases=['vhost']),
-        tracing=dict(default='off', choices=BOOLEANS, aliases=['trace'], type='bool'),
+        tracing=dict(default='off', aliases=['trace'], type='bool'),
         state=dict(default='present', choices=['present', 'absent'])
     )
 
diff --git a/library/seboolean b/library/seboolean
index 28893bd9bcd..ac03374a646 100644
--- a/library/seboolean
+++ b/library/seboolean
@@ -158,8 +158,8 @@ def main():
     module = AnsibleModule(
         argument_spec = dict(
             name=dict(required=True),
-            persistent=dict(default='no', choices=BOOLEANS, type='bool'),
-            state=dict(required=True, choices=BOOLEANS, type='bool')
+            persistent=dict(default='no', type='bool'),
+            state=dict(required=True, type='bool')
         )
     )
 
diff --git a/library/subversion b/library/subversion
index c92c3c2627b..2f86f91035a 100644
--- a/library/subversion
+++ b/library/subversion
@@ -129,7 +129,7 @@ def main():
             dest=dict(required=True),
             repo=dict(required=True, aliases=['name', 'repository']),
             revision=dict(default='HEAD', aliases=['rev']),
-            force=dict(default='yes', choices=BOOLEANS, type='bool'),
+            force=dict(default='yes', type='bool'),
             username=dict(required=False),
             password=dict(required=False),
         )
diff --git a/library/sysctl b/library/sysctl
index a310f5dc9d3..6951ea15aa7 100644
--- a/library/sysctl
+++ b/library/sysctl
@@ -208,7 +208,7 @@ def main():
             value = dict(aliases=['val'], required=False),
             state = dict(default='present', choices=['present', 'absent']),
             checks = dict(default='both', choices=['none', 'before', 'after', 'both']),
-            reload = dict(default=True, choices=BOOLEANS, type='bool'),
+            reload = dict(default=True, type='bool'),
             sysctl_file = dict(default='/etc/sysctl.conf')
         )
     )
diff --git a/library/uri b/library/uri
index 074658ec7af..3c97f33dad6 100644
--- a/library/uri
+++ b/library/uri
@@ -267,9 +267,9 @@ def main():
             password = dict(required=False, default=None),
             body = dict(required=False, default=None),
             method = dict(required=False, default='GET', choices=['GET', 'POST', 'PUT', 'HEAD', 'DELETE', 'OPTIONS']),
-            return_content = dict(required=False, default='no', choices=BOOLEANS, type='bool'),
-            force_basic_auth = dict(required=False, default='no', choices=BOOLEANS, type='bool'),
-            follow_redirects = dict(required=False, default='no', choices=BOOLEANS, type='bool'),
+            return_content = dict(required=False, default='no', type='bool'),
+            force_basic_auth = dict(required=False, default='no', type='bool'),
+            follow_redirects = dict(required=False, default='no', type='bool'),
             creates = dict(required=False, default=None),
             removes = dict(required=False, default=None),
             status_code = dict(required=False, default="200"),
diff --git a/library/user b/library/user
index f1e99e44b3e..a297019cd01 100644
--- a/library/user
+++ b/library/user
@@ -1002,13 +1002,13 @@ def main():
             shell=dict(default=None),
             password=dict(default=None),
             # following options are specific to userdel
-            force=dict(default='no', choices=BOOLEANS, type='bool'),
-            remove=dict(default='no', choices=BOOLEANS, type='bool'),
+            force=dict(default='no', type='bool'),
+            remove=dict(default='no', type='bool'),
             # following options are specific to useradd
-            createhome=dict(default='yes', choices=BOOLEANS, type='bool'),
-            system=dict(default='no', choices=BOOLEANS, type='bool'),
+            createhome=dict(default='yes', type='bool'),
+            system=dict(default='no', type='bool'),
             # following options are specific to usermod
-            append=dict(default='no', choices=BOOLEANS, type='bool'),
+            append=dict(default='no', type='bool'),
             # following are specific to ssh key generation
             generate_ssh_key=dict(choices=BOOLEANS, type='bool'),
             ssh_key_bits=dict(default=ssh_defaults['bits']),