disused:amenity=fuel
is all that is needed for such objects.
See this:
https://wiki.openstreetmap.org/wiki/Lifecycle_prefix

What I try to change is wrong spelling of tags or wrong use.
I cannot see if something is not in use anymore, but therefor we need local mappers (but with the right tools, like the life cycle prefix).

And you can always add the amenity=fuel to the "building:use=residential".

Marc.
