resolving shadowing mistakes that crept in somehow
the new location comes first; this led to backwards-looking messages