Fixed underscore-typed to handle chaining