More work on reaching definitions. Looks like it's working now. Let's test some more.