Fix code so that corner cases of %{%{foo}:-%{bar}} work