Analysis: Fix using PreBuiltXXXFactory

Closes #25