No worries :) I will go back now and overlap those areas to clearly indicate the need for a long-term solution for how to properly mark these areas. Thank you for your attention to detail!

I was doing the edits while standing at my desk, not at an armchair :) I agree that someone on the ground will have to resolve the exact method of displaying the gatehouses. Since HOT Project #9851 was focused exclusively on buildings, and buildings overlapping with roads was a key item on the list you kindly provided in the comments section of #9851, I decided fix the overlapping error while preserving the existing building data so that a local mapper could go back and enact a permanent fix when the community decided on the optimal method of displaying this feature. I'm happy to revert it if you would prefer it the previous way, though :) (as well as the pedestrian bridge by the dock from your other changeset comment)

If you have any feedback about the other error fixes I submitted beyond these five buildings, I would love to hear it! :)