A fix to the build and the jump-to-definition feature. Fixes #544, fixes #633

The dependency checker won't let you do that, on violation-of-modularity grounds. I don't have time to respond in more detail right now; perhaps in a few days.