adjustments to match the cleanups in libefgy