Improve member_select and method_invocation