Simplifications in source parsing and improved test code coverage.