Linting fixes

13 jobs for basic-parser in 24 minutes and 25 seconds (queued for 2 seconds)