Work on #188 - properly recording enter keystrokes in more situations.