Code review comment for lp://staging/~thomir-deactivatedaccount/xpathselect/trunk-extend-type-name-options

1. trunk-extend-type-name-options
2. Merge into trunk