Changes to address the concerns raised in #712

This changeset should prevent pointless calls to goFaster. It needs verification by those the issue affects.