Removed statics from `build_geometry`.