More work on duplicateDecls, to reduce the gap between signature and decl.