Tweaked CoreUtil slightly.