Fix right arrow handling.

Bug introduced in recent refactoring.