We weren't properly propagating the alignment to other variants after 
applying it, so we ended up with two const-qualified variants with 
different alignment.

Tested x86_64-pc-linux-gnu, applying to trunk and 5.