Fixes to analysis manipulation algorithms.
More analysis split/merge tweaks.