Merge "Clean up after verifier changes wrt. conflict/undefined reg."