Bug [3602534]: Test for XScreensaver last.
Bug [3599928]: Use XkbKeycodeToKeysym if available.
Oops. Missed removing one line in last commit.