Some improvements to go/focus handles.