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

uh, no special process, just some combination of that and actual discussion/consensus