Remove the last EOL which is not necessary

Remove unused vars which cause warnings
Add comment lookup from sources
Use comment lookup to break one-liner expressions having preceding comments

Tests are modified accordingly.
Looking up based on range only is not good enough.
Rename CodeMatcher to TokenMatcher

Now as usual, there are there failing tests