Fixed cyth's handling of empty annotations. Added annotations to replace_funcalls, for testing with make_benchmarks. Committing some of Jon's magic import code.