Remove memset() style changes to reduce diff size