of redundant sub-selects.  initdb not forced, since this is just a
cosmetic change, but the new code won't show up till you do one.