diff --git a/src/tomb b/src/tomb
index 4c79785..d978d74 100755
--- a/src/tomb
+++ b/src/tomb
@@ -88,29 +88,29 @@ function _message say()
 {
     local notice="message"
     [[ "$1" = "-n" ]] && shift && notice="inline"
-    (( $QUIET )) || _msg "$notice" "$1"
+    option_is_set -q || _msg "$notice" "$1"
     return 0
 }
 alias act="_message -n"
 function _verbose xxx()
 {
-    (( $DEBUG )) && _msg verbose "$1"
+    option_is_set -D && _msg verbose "$1"
     return 0
 }
 function _success yes()
 {
-    (( $QUIET )) || _msg success "$1"
+    option_is_set -q || _msg success "$1"
     return 0
 }
 function _warning  no()
 {
-    (( $QUIET )) || _msg warning "$1"
+    option_is_set -q || _msg warning "$1"
     return 1
 }
 function _failure die()
 {
     typeset -i exitcode=${2:-1}
-    (( $QUIET )) || _msg failure "$1"
+    option_is_set -q || _msg failure "$1"
     exit $exitcode
 }