Instead of a DeclMap, parameterize Declaration

Still not sure if this is the best way to do this, but it's unblocking
further work.