[z2024] Optimize some parts for ++C

(based on commit 2ee521a)

(cleaned version of f23e657)

(based on commit [s1635] - 6369d3d)