This fixes several post-commit nits from D79688 and D80135, namely typos, debug output and control flow inversion.