Finish cfg syntax transition

r? @alexcrichton