Moving analysis stubs out of motivation