Extend the fix of #92 to handle func name refs on nonlinear addressings