Properly forward annotations, and don't reset failures when caught once