More work on Razer wrapper and some cleanup in other parts.