More crusading against protected variables.
Merged IWarlockHighlight into IWarlockPattern.
Caused merges of some supporting classes that became redundant.