[ticket/10472] More clearing and white-space fixes

PHPBB3-10472