More refinements to the return clause based on implementation feedback.