Eliminated NoILS dependency on service locator.