To give people a feel for the effect of this patch, attached is the 
output of ‘make check-declare’ before and after the patch. The patch 
shrinks the output size from 148 to 8 kB.