WatermarkEngineBase.watermark() refactored