I personally prefer this over randomly dropping nodes in the middle of building polygons, unsure if combining amenities with their main entrance in a building is the proper way to map this (I haven't seen this used in my local area) but it maintains the "one feature, one OSM element" rule and it more accurately depicts where each amenity can be accessed from.