A cleanup in 7f418acf accidentally discarded some parens in ConDeclGADT. Make sure these stay in the AST in a usable format. Also ensure the AnnLolly does not get lost in a GADT. (cherry picked from commit 36787bba)