Roll expansion phase into analyzer. Fixes #1.