more cleanups
avoid using model when resolving links
use address to link to declarations