Simplify funcresolve a bit more