GUAC-807 Moved usage of safeApply to a more sane place.