Fix naming clash in new-alias.
Cleaned up analysis library.