Move GI to a deferred pass
Geometry
Geometry2D
Geometry3D
Extra `_2d` suffixes are removed from 2D methods accoringly.