Further work on the Trellis class and its test.