[D1] Few changes to -v2 diagnostics

As previously discussed in e-mail, updated messages better reflect what we are
actually going to do. Also removes accidental debug printf.