Ported to astro-0.9.