Correcting #1's check and beefing up tests in HHH-8784. Documenting #2 with HHH-8785.

Christian Bauer, I tried reproducing the your original issue and couldn't (at least not with a DDL default). What are you using to generate? Please attach a test case.