- Improved remove next keyword behavior.