Simplify getEntrypointAndArgs Upstream-commit: 2b1b7823e61d9d14064708d37a56275ee7385bd2 Component: engine