MADS: Remove some magic values related to verbs