Updates to InvocationBuilder for field and method invocation special cases