Fix build... It now compiles against todays trunk, and runs just as well as it always...