Re-merge r2t into statcheck