Some more smasher performance shenanigans