Fix regression with multiple entry points. Fixes GH-20.