esp: avoid structure holes spotted by pahole