The Right Way to Renew TCJA: Smarter Cuts, Fewer Gimmicks