Explicitly print out which analysis mode we are in.
Fix vector clear() calls when filling.
Fix analysis mode setting.
Update for latest production versions.