Now (featurep! :category module +flag) will work properly check for +flag rather than just returning t if :category module were enabled. Also update variables to match category-module nomenclature.