Divorces out cairo dependency (now optional).