Correctly choose the location for a demoted decl