More watermark processor refactoring