Issue #114: trying harder to resolve references by unqualified method name