Moving more things out of the old SA. Now for more cleanup in the individual analyzers.