Get within-term cursor movement working again