Fix the "Unmatched start" error.

@seanmonstar - could you give a quick review? These two were left over from #3517

An ephemeral instance is available: unmatched-start.personatest.org

fixes #3543