Fix return key mapping conflicts with auto-pairs