maintain original full-disambiguation for lawyers
make cl args to consolidate optional
start adjusting consolidate integration tests
remove old comment