Fix #85 - Ensure the caret is always at a valid position.

The Remove Staff/System commands previously had special code to handle
this, but they no longer need to do that.