Minor cleanup and potential fix for cursor visibility issues.