Simplify geometry file loading. Fixes pre-C++11 compile error.