Better handling of slurping comments and EOF
Todos and FIXMEs