- Another attempt to fix taint when levelling up in combat
- Disable hiding WatchFrame in combat
- Minor cleanup