Improved executor service handling.