More static buffer eradication