More work on the ZORRO analysis layer.