Improve live/infinite RMB handling.