Fixes #3301 - Reformat to use only ${} instead of $() for initial-promises too