Many static analysis fixes in beta_claim_forms