Add functions/types for XPath support.

`Int` instead of `Short`.