diff --git a/tasks/main.yml b/tasks/main.yml
index 3d6e66c..32c80e7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -50,14 +50,18 @@
 
 # Setup/install tasks.
 - include_tasks: setup-RedHat.yml
-  when: (php_install_from_source == false) and (ansible_os_family == 'RedHat')
+  when:
+    - not php_install_from_source
+    - ansible_os_family == 'RedHat'
 
 - include_tasks: setup-Debian.yml
-  when: (php_install_from_source == false) and (ansible_os_family == 'Debian')
+  when:
+    - not php_install_from_source
+    - ansible_os_family == 'Debian'
 
 # Install PHP from source when php_install_from_source is true.
 - include_tasks: install-from-source.yml
-  when: php_install_from_source == true
+  when: php_install_from_source
 
 # Configure PHP.
 - include_tasks: configure.yml