[WIP] Resolve long resolution in function call