The macros are, unfortunately, still a mess -- I've been putting off trying to get them cleaned up.

Hmm. This should not have been easy to do; the "Clean" key has a different value in a different keyset (and is using a different key name) from the "Enter" key... For it to go that wrong, something is very bad. My only guess right now would be that my code is tripping up over itself somewhere. I really need to give the entire macro subsystem a complete overhaul. I'll try to at least take a good look at it this weekend...