(fix) Experimental optimization, part 2

Update to fix static geometry optimization, more corner cases.

It is not recommended to use for main production without a lot of testing across multiple platforms.

Please report back results with static on and off, include GPU and CPU, this optimization is likely to work differently across platforms.