Clean up line lexing

-Ignore empty lines, which is required by the spec.
-Separate the lexing of logical lines with the token generation.