[wat] Modernize