Fix: Ensure comments are attached for return (fixes #2)