Tidied up illustration popover code.