This looks very good - apart from the column name thing noted.

This by the way has an effect on actual rendering - it removes an inconsistency in dealing with leisure=slipway:

before:

after:

Of course there are very few or no leisure=slipway bridges or tunnels in reality.

Thanks for taking the time to do maintenance work like this - we do this way too little. And of course it is rather unattractive compared to actual design work