Apply the recent keypress bugfix/debugging to the new repo source as well.