remove bogus cross-phase-persistent declaration

Also fix and improve source-location reporting.