Discriminate Return / Return+Shift

Now easier to add new key down preview mappings, but didn't bother to go
back and modify other ones