More work on versioned cross tables.