Remove stale function names in imports.
Remove more stale function names in imports.
Merge pull request #79 from pjonsson/buildfixes

Make the tree build with Syntactic 1.9.