Fix bug with source resolver when dealing with unresolvable names and alter code for clarity and style.