Astro: small optimizations.