Don't finish the current command twice.

This bug was never noticed, but was revealed by a new assertion check.