Welp, we escape the arguments properly this time since it doesn't work anymore for some reason but at least it is consistent for both binary- and shell-based wrappers.
