Some cleanup of what gets a tooltip