Updated for Callimachus 1.3.