Minor touchup of go-to-declaration code