Improved delayed evaluation and completion.