volt: Change order of arguments to linker
semantic: Consolidate more lookup functions