[ticket/12941] Fix remaining Sami complaints.

PHPBB3-12941