Improve naming in preparation for adding messaging
Remove temporary fix for X11 and Win32 crash

This has now been fixed in GLFW: https://github.com/elmindreda/glfw/commit/aec952e8dce2bab1f71a11d4b554d58c816fa20f