I used to run into this type of problem frequently. I've found that personally adopting something like https://conventionalcomments.org really helps with ambiguity.