Cleanup of mod cursor support (WIP)