Improve handling of null set of prohibitions.
Diff improvements.