Try harder to avoid -esp on :Gcommit follow-up

Closes #516.