EPA: Better fix for #22919
The original fix for #22919 (closed) simply removed the ability to match up prior comments with the first declaration in the file.
Restore it, but add a check that the comment is on a single line, by ensuring that it comes immediately prior to the next thing (comment or start of declaration), and that the token preceding it is not on the same line.