Refactor use of shared completion functions Upstream-commit: 453c5c1650ddb45a1500c137bb58a68230fc8a77 Component: engine