Minor rework of watermark code. Single flag var instead of duplicated "show watermark" code.