Add tests specifically for extra lines and comments being parsed correctly.
Fix edge cases for extra lines on the last test.
Refactor _onextra method.