Mutable watermark producer and small optimisation