Improved the parser output and trellis loading to better support integration with Vineyard.