--- 'astro': patch --- Improve error handling when top-level `return` is present