Revised Thunk struct to use proc, update code to and test on rustc
master commit 5efac2.