Some fixes/updates to tooltip generation (e.g. charms).