Small refactoring of NoGeom experiment.